(command-line-1): Check that user-init-file non-nil.

diff --git a/lisp/startup.el b/lisp/startup.el
index 07c6c241f323f2581e22dc3ac6b9db2ca4589a82..8350da2365888a9d910400883de5cdee3b3bd05c 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -753,6 +753,7 @@ If this is nil, no message will be displayed."
 (defun command-line-1 (command-line-args-left)
   (or noninteractive (input-pending-p) init-file-had-error
       (and inhibit-startup-echo-area-message
+          user-init-file
           (or (and (get 'inhibit-startup-echo-area-message 'saved-value)
                    (equal inhibit-startup-echo-area-message
                           (if (string= init-file-user "")